From 5cd289dc1d908e79106e20eaa4a85749f2286606 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Exp=C3=B3sito?= Date: Fri, 18 Jun 2021 17:55:47 +0200 Subject: [PATCH] gtkeventcontrollerscroll: Refactor scroll begin Move the logic to begin scrolling to its own function to be able to reuse it. Refactor, no functional changes. Part-of: --- gtk/gtkeventcontrollerscroll.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/gtk/gtkeventcontrollerscroll.c b/gtk/gtkeventcontrollerscroll.c index b246bb22db..cfe284cd71 100644 --- a/gtk/gtkeventcontrollerscroll.c +++ b/gtk/gtkeventcontrollerscroll.c @@ -235,6 +235,21 @@ gtk_event_controller_scroll_get_property (GObject *object, } } +static gboolean +gtk_event_controller_scroll_begin (GtkEventController *controller) +{ + GtkEventControllerScroll *scroll = GTK_EVENT_CONTROLLER_SCROLL (controller); + + if (scroll->active) + return FALSE; + + g_signal_emit (controller, signals[SCROLL_BEGIN], 0); + scroll_history_reset (scroll); + scroll->active = TRUE; + + return TRUE; +} + static gboolean gtk_event_controller_scroll_handle_event (GtkEventController *controller, GdkEvent *event, @@ -258,13 +273,7 @@ gtk_event_controller_scroll_handle_event (GtkEventController *controller, if (direction == GDK_SCROLL_SMOOTH) { gdk_scroll_event_get_deltas (event, &dx, &dy); - - if (!scroll->active) - { - g_signal_emit (controller, signals[SCROLL_BEGIN], 0); - scroll_history_reset (scroll); - scroll->active = TRUE; - } + gtk_event_controller_scroll_begin (controller); if ((scroll->flags & GTK_EVENT_CONTROLLER_SCROLL_VERTICAL) == 0) dy = 0; -- 2.30.2